Implemented different eraser and selector modes by Nezznee · Pull Request #1111 · LinwoodDev/Butterfly

Nezznee · 2026-06-01T15:59:15Z

See #833

HitElementMode.none (For now only relevant when erasing shapes -> should shapes be erased)
HitElementMode.full (Only relevant when selecting elements -> replaces the old fullSelection corner setting)
HitElementMode.touchEdges (Relevant when erasing or selecting elements)
HitElementMode.touchAnywhere (Relevant when erasing or selecting elements)

removed the old fullSelection corner setting in camera
changed the "Delete Elements" checkbox name in the eraser tools to "Erase all Elements"
removed unused typedef HitRequest in document_bloc.dart:1701

(which also replaces the fullSelection corner setting)

Nezznee · 2026-06-01T16:03:23Z

Yippie, I got number #1111

CodeDoctorDE · 2026-06-01T16:05:27Z

Hi, thanks for contributing. 1111 :)
Can you run dart format in the root?

Copilot

Pull request overview

This PR introduces a unified HitElementMode to control how elements are hit-tested for selection and erasing, aiming to address cases like #833 (erasing inside a shape) and to replace the previous “full selection” utility toggle with a per-tool setting.

Changes:

Added HitElementMode to tool models (select/eraser/path eraser) and wired it through selection/eraser handlers into DocumentBloc ray casting.
Updated hit-testing APIs (HitCalculator) and implementations (notably shapes) to support none/full/touchEdges/touchAnywhere.
Updated tool property UIs and English localization; removed the old fullSelection utility state + UI.

Reviewed changes

Copilot reviewed 18 out of 22 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
app/lib/visualizer/property.dart	Adds localized labels for the new `HitElementMode` values in the UI.
app/lib/selections/tools/tool.dart	Adds `SelectToolSelection` wiring for tool property panels.
app/lib/selections/tools/select.dart	New selection-tool properties UI for choosing `HitElementMode`.
app/lib/selections/tools/path_eraser.dart	Adds “Erase shapes” mode UI + renames “Delete elements” label.
app/lib/selections/tools/eraser.dart	Adds “Erase shapes” mode UI + renames “Delete elements” label.
app/lib/selections/selection.dart	Registers the new select-tool selection panel part.
app/lib/selections/document.dart	Removes the old `fullSelection` checkbox from document utilities UI.
app/lib/renderers/renderer.dart	Updates `HitCalculator` API and `DefaultHitCalculator` signature to use `HitElementMode`.
app/lib/renderers/elements/shape.dart	Implements `HitElementMode` semantics for shape hit-testing (incl. `touchEdges`/`none`).
app/lib/renderers/elements/polygon.dart	Updates polygon hit-testing signature to accept `HitElementMode` (logic mostly unchanged).
app/lib/renderers/elements/pen.dart	Updates pen-path hit-testing signature to accept `HitElementMode` (logic mostly unchanged).
app/lib/l10n/app_en.arb	Adds English strings for new modes and renames the eraser checkbox label.
app/lib/handlers/select.dart	Passes `hitElementMode` from `SelectTool` into ray casting.
app/lib/handlers/path_eraser.dart	Passes `hitElementMode` from `PathEraserTool` into ray casting.
app/lib/handlers/eraser.dart	Passes `hitElementMode` from `EraserTool` into ray casting.
app/lib/bloc/document_bloc.dart	Replaces `full` raycast parameter with `hitElementMode`; removes unused typedef.
api/lib/src/models/utilities.g.dart	Removes `fullSelection` from utilities JSON serialization.
api/lib/src/models/utilities.freezed.dart	Removes `fullSelection` from the freezed utilities model.
api/lib/src/models/utilities.dart	Removes `fullSelection` field from `UtilitiesState`.
api/lib/src/models/tool.g.dart	Adds JSON (de)serialization for `hitElementMode` and `HitElementMode` enum mapping.
api/lib/src/models/tool.freezed.dart	Adds `hitElementMode` to select/eraser/path eraser tool variants (generated).
api/lib/src/models/tool.dart	Introduces `HitElementMode` enum and adds `hitElementMode` to select/eraser/path eraser tools.

Files not reviewed (4)

api/lib/src/models/tool.freezed.dart: Language not supported
api/lib/src/models/tool.g.dart: Language not supported
api/lib/src/models/utilities.freezed.dart: Language not supported
api/lib/src/models/utilities.g.dart: Language not supported

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Nezznee · 2026-06-01T17:21:05Z

+      return switch (this) {
+        HitElementMode.none => loc.eraseShapeModeNone,
+        HitElementMode.touchEdges => loc.eraseShapeModeTouchEdges,
+        HitElementMode.touchAnywhere => loc.eraseShapeModeTouchAnywhere,
+        _ => '', // this shouldn't happen
+      };
+    } else {
+      return switch (this) {
+        HitElementMode.full => loc.fullSelection,
+        HitElementMode.touchEdges => loc.selectElementModeTouchEdges,
+        HitElementMode.touchAnywhere => loc.selectElementModeTouchAnywhere,
+        _ => '', // this shouldn't happen
+      };


@CodeDoctorDE Do we have something like this? loc.notSet() is a thing that's actually used for text in the app.

yeah i like the idea of notSet:

Butterfly/app/lib/l10n/app_en.arb

Line 289 in 7cbf4f4

"notSet": "Not set",

. Then the user knows that this is a state (feel free to keep the comment)

Nezznee · 2026-06-01T17:21:33Z

+      return switch (this) {
+        HitElementMode.none => loc.eraseShapeModeNone,
+        HitElementMode.touchEdges => loc.eraseShapeModeTouchEdges,
+        HitElementMode.touchAnywhere => loc.eraseShapeModeTouchAnywhere,
+        _ => '', // this shouldn't happen
+      };
+    } else {
+      return switch (this) {
+        HitElementMode.full => loc.fullSelection,
+        HitElementMode.touchEdges => loc.selectElementModeTouchEdges,
+        HitElementMode.touchAnywhere => loc.selectElementModeTouchAnywhere,
+        _ => '', // this shouldn't happen
+      };


same as above

yeah i would add notSet also here

Nezznee · 2026-06-01T17:16:56Z

+    if (hitElementMode == HitElementMode.full) {
      return _allPointsInside(_points, rect.contains);
    }


@CodeDoctorDE Should polygon elements also have the new behaviour that shapes have with this pr?

Yeah please :)

Nezznee · 2026-06-01T17:25:52Z

  @override
-  bool hit(Rect rect, {bool full = false}) {
+  bool hit(
+    Rect rect, {
+    HitElementMode hitElementMode = HitElementMode.touchAnywhere,
+  }) {
    if (!this.rect.inflate(element.property.strokeWidth).overlaps(rect)) {


@CodeDoctorDE Should I add tests?

A long time I didn't add tests and I needed to fixed many regressions. I would prefer adding tests now for new features. I'm currently adding more and more tests to the app to have it in a good state

Nezznee · 2026-06-01T16:45:15Z

Oh, I think I build in a bug, where shapes that are fully contained in the lasso don't get selected. Let me fix that really quick

CodeDoctorDE · 2026-06-03T16:39:45Z

Hi, can you update with the latest develop changes?

Nezznee · 2026-06-04T13:21:32Z

Waiting for #1118 to be resolved so hitting rotating shapes can be tested

# Conflicts: # app/lib/renderers/elements/shape.dart # app/lib/renderers/renderer.dart # app/test/renderers/shape_renderer_test.dart

Nezznee · 2026-06-04T15:47:56Z

These commits should also fix unknown bug I found where triangles can't be selected by a rect in full mode. Also selecting polygons should now work on any segement not only on the vertices.

CodeDoctorDE

lgtm, will be merged once develop is on 2.6

Nezznee · 2026-06-07T14:44:17Z

I think polygon elements should also count as stroke elements as with this pr the interaction with them is the same as it is with shapes.

CodeDoctorDE · 2026-06-07T14:45:10Z

yeah feel free to add it

Nezznee · 2026-06-08T14:41:27Z

I just noticed. I forgot the insert method and the super call in the build method of selectToolSelection. Should be fine tho if merged with the latest merge to dev.

CodeDoctorDE · 2026-06-08T18:31:10Z

Tested it, works wonderful thank you very much for your contribution. Will be available in 2.6.0-beta.0

Implemented different eraser and selector modes

85f6c20

(which also replaces the fullSelection corner setting)

github-project-automation Bot added this to Butterfly Jun 1, 2026

ran dart format .

6ec8553

CodeDoctorDE requested a review from Copilot June 1, 2026 16:14

Copilot started reviewing on behalf of CodeDoctorDE June 1, 2026 16:14 View session

Copilot AI reviewed Jun 1, 2026

View reviewed changes

Fix shapes fully inside lasso not selected when touchEdge

e51d49c

Nezznee mentioned this pull request Jun 2, 2026

[Bug]: Using path eraser inside of a shape deletes the shape #833

Closed

1 task

nezznee added 2 commits June 3, 2026 17:07

Add polygon affected hitElementMode

6971f53

Polygon and shape tests + triangle bugfix

4107df3

nezznee added 2 commits June 4, 2026 17:16

Merge remote-tracking branch 'upstream/develop' into develop

aee9676

# Conflicts: # app/lib/renderers/elements/shape.dart # app/lib/renderers/renderer.dart # app/test/renderers/shape_renderer_test.dart

Merge adjustments and triangle bugfix

ef40088

Nezznee mentioned this pull request Jun 6, 2026

Added subtype tool switching for selection and spacer #1122

Merged

CodeDoctorDE approved these changes Jun 6, 2026

View reviewed changes

github-project-automation Bot moved this to 🚧 In Progress in Butterfly Jun 6, 2026

Add PolygonElement in isStroke

6aeeae0

CodeDoctorDE and others added 5 commits June 8, 2026 16:45

Merge branch 'develop' into develop

79bc915

Merge remote-tracking branch 'upstream/develop' into develop

2964da2

Merged from upstream

4daa000

Merge remote-tracking branch 'origin/develop' into develop

853fde8

Forgot an unused variable

ed4105e

nezznee added 2 commits June 8, 2026 17:43

Removed unreachable code, removed unused string

caeefa4

Removed unused string from all loc files

e3af912

CodeDoctorDE merged commit 2b83933 into LinwoodDev:develop Jun 8, 2026
19 checks passed

github-project-automation Bot moved this from 🚧 In Progress to ✅ Done in Butterfly Jun 8, 2026

Conversation

Nezznee commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Nezznee commented Jun 1, 2026

Uh oh!

CodeDoctorDE commented Jun 1, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Nezznee commented Jun 1, 2026

Uh oh!

CodeDoctorDE commented Jun 3, 2026

Uh oh!

Nezznee commented Jun 4, 2026

Uh oh!

Nezznee commented Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CodeDoctorDE left a comment

Choose a reason for hiding this comment

Uh oh!

Nezznee commented Jun 7, 2026

Uh oh!

CodeDoctorDE commented Jun 7, 2026

Uh oh!

Nezznee commented Jun 8, 2026

Uh oh!

CodeDoctorDE commented Jun 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Nezznee commented Jun 1, 2026 •

edited

Loading

Nezznee commented Jun 4, 2026 •

edited

Loading